Skip to content

Migrate remove_dbg assist to use SyntaxEditor #20224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jul 11, 2025
Merged

Migrate remove_dbg assist to use SyntaxEditor #20224

merged 1 commit into from
Jul 11, 2025
+44 −43

Conversation

@Hmikihiro
Copy link
Contributor

@Hmikihiro Hmikihiro commented Jul 10, 2025

part of #15710 and #18285

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 10, 2025
ShoyuVanilla
ShoyuVanilla reviewed Jul 10, 2025
View reviewed changes
crates/ide-assists/src/handlers/remove_dbg.rs
Copy link
Member

@ShoyuVanilla ShoyuVanilla Jul 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there are still some places to migrate left in this file, like:

rust-analyzer/crates/ide-assists/src/handlers/remove_dbg.rs

Lines 51 to 53 in e9968fc

builder.replace(range, expr.to_string());
} else {
builder.delete(range);

@Hmikihiro Hmikihiro force-pushed the migrate_remove_dbg branch from b7448a5 to c79e24c Compare July 11, 2025 07:30
ShoyuVanilla
ShoyuVanilla approved these changes Jul 11, 2025
View reviewed changes
Copy link
Member

@ShoyuVanilla ShoyuVanilla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@ShoyuVanilla ShoyuVanilla enabled auto-merge July 11, 2025 07:41
@ShoyuVanilla ShoyuVanilla added this pull request to the merge queue Jul 11, 2025
@lnicola
Copy link
Member

lnicola commented Jul 11, 2025 •
edited
Loading

Just FYI, I tried to update the list in #18285 (comment). A couple of them are not clear-cut though, like convert_bool_then, which was ported, but still uses clone_for_update to adjust the indent (and in one other place).

Merged via the queue into rust-lang:master with commit eaeee0b Jul 11, 2025
15 checks passed
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 11, 2025
@ShoyuVanilla
Copy link
Member

ShoyuVanilla commented Jul 11, 2025

Just FYI, I tried to update the list in #18285 (comment). A couple of them are not clear-cut though, like convert_bool_then, which was ported, but still uses clone_for_update to adjust the indent (and in one other place).

I guess some of them are my faults 😅

Anyway we really need to handle whitespaces accordingly and I'll take a look into it

@Hmikihiro Hmikihiro mentioned this pull request Jul 21, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ShoyuVanilla ShoyuVanilla ShoyuVanilla approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Hmikihiro @lnicola @ShoyuVanilla @rustbot